New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merging of an update of a symbol with an insert_before operation before the same symbol #19450

Merged

nathansobo merged 2 commits into main from fix-edit-merging

Oct 19, 2024

Contributor

nathansobo commented Oct 19, 2024 •

edited

Loading

When we insert before some text and then update that same text, we need to preserve and concatenate the new text associated with both operations.

Release Notes:

N/A


          AI edits: Failing test: Merge insert_before with update of same symbol

41fa072

cla-bot bot added the cla-signed label


          Concatenate new text when merging insert before w/ update to same text

zed-industries deleted a comment from zed-industries-bot

nathansobo marked this pull request as ready for review

October 19, 2024 14:13

nathansobo merged commit 781fff2 into main

14 checks passed

nathansobo deleted the fix-edit-merging branch

October 19, 2024 14:36

Collaborator

maxbrunsfeld commented Oct 19, 2024

⚡

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels